From: Christian Aistleitner <qchris@users.mediawiki.org>
Date: Mon, 19 Mar 2012 23:36:48 +0000 (+0000)
Subject: Follow up to r114126: Being more conservative for HipHop compiler
X-Git-Tag: 1.31.0-rc.0~24187
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=42c88dc137752e49143627416c585436721f0226;p=lhc%2Fweb%2Fwiklou.git

Follow up to r114126: Being more conservative for HipHop compiler
---

diff --git a/includes/parser/Preprocessor_HipHop.hphp b/includes/parser/Preprocessor_HipHop.hphp
index 0cf2e8a0a7..aedcac23a5 100644
--- a/includes/parser/Preprocessor_HipHop.hphp
+++ b/includes/parser/Preprocessor_HipHop.hphp
@@ -444,7 +444,8 @@ class Preprocessor_HipHop implements Preprocessor {
 			} elseif ( $found === 'line-end' ) {
 				$piece = $stack->getTop();
 				// A heading must be open, otherwise \n wouldn't have been in the search list
-				assert( '$piece->open === "\n"' );
+				assert( $piece->open === "\n" ); // Passing the assert condition directly instead of string, as
+				                                 // HPHP /compiler/ chokes on strings when ASSERT_ACTIVE != 0.
 				$part = $piece->getCurrentPart();
 				// Search back through the input to see if it has a proper close
 				// Do this using the reversed string since the other solutions (end anchor, etc.) are inefficient